Cherry-pick of 663f454 has failed:

On branch mergify/bp/9.3/pr-52005
Your branch is up to date with 'origin/9.3'.

You are currently cherry-picking commit 663f45459.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   packetbeat/config/config.go
	modified:   packetbeat/tests/system/config/packetbeat.yml.j2
	modified:   packetbeat/tests/system/test_0060_flows.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packetbeat/beater/packetbeat.go
	both modified:   packetbeat/beater/processor.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

🤖 GitHub comments

Just comment with:

• run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)
• /test : Run the Buildkite pipeline.

Pinging @elastic/sec-linux-platform (Team:Security-Linux Platform)

This pull request has not been merged yet. Could you please review and merge it @khushijain21? 🙏

TL;DR

The Buildkite failure is caused by unresolved cherry-pick conflict markers committed in packetbeat/beater/packetbeat.go and packetbeat/beater/processor.go. Resolve the backport conflicts and push a commit without <<<<<<<, =======, or >>>>>>> markers; both failing jobs should then proceed past formatting and pre-commit.

Remediation

• Resolve the conflicts in packetbeat/beater/packetbeat.go:100-111 and packetbeat/beater/processor.go:52-69, preserving the intended shutdown_timeout delegation and the 9.3 branch behavior.
• Remove all conflict-marker lines and verify the resolved files compile.
• Re-run make -C packetbeat check update, make check-no-changes, and pre-commit run --all-files.

What is this? | From workflow: PR Buildkite Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

Resolved the cherry-pick conflicts and pushed.

9.3 adaptation: #51136 (libbeat drain watchdog / Beat.ShutdownTimeout) is not on 9.3, so this adds the Beat.ShutdownTimeout field for the beater assignment (forward-compatible). Processor flush wait uses publish_timeout so CheckConfig no longer blocks on shutdown_timeout. Kept existing status-reporter APIs; did not pull main-only logger changes from #51631.

Packetbeat beater/config compile cleanly locally.

TL;DR

The golangci-lint Ubuntu job failed on four Packetbeat diagnostics in packetbeat/beater/packetbeat.go and packetbeat/beater/processor.go. Update the PR-head code to use the beat logger, WaitGroup.Go, and the non-deprecated manager lifecycle before rerunning the check.

Remediation

• Replace the two logp.L() calls in packetbeat/beater/packetbeat.go with the injected b.Info.Logger (Warnw for the diagnostic hook and Warn for pipelinesWarning).
• Simplify processor.Start in packetbeat/beater/processor.go to use p.wg.Go(func() { ... }), removing the separate Add(1)/Done() pattern.
• Replace b.Manager.Start() in runManaged with b.Manager.PreInit() error handling followed by b.Manager.PostInit(), matching the existing Packetbeat lifecycle pattern.
• Rerun the golangci-lint check on the updated branch.

What is this? | From workflow: PR Actions Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.